More GUI Changes

Finished GUI concept