Improved second GUI layout to desired layout, still in seperate file