More GUI tweaks :D