More work on GUI Layout

Almost done with the GUI Layout.