Improved GUI Layout