Layout GUI tweaks