Improved GUI layout