Improved: GUI tweaks