Some GUI tweaks!