Gui version 1.1

Various fixes and new additions. Rearrange components.