GUI handler tweaks