GUI Prototype/Small fix