Improved and finished GUI layout