Changed some crap.
further changes to Gui and added Mockup
further changes to Gui and added Mockup