Merge remote-tracking branch 'groxxda/gui-fixes' into 1.1