GUI updates
Merge branch '06/feature/test_og_ui' into 06-Development
small changes to GUI