Refac
Gui changes. Added menu bar. Save to implement yet
Menu item concept for save
Merge branch 'master' into martyn82