GUI 1st draft

merging first draft of changes from Kr0nZ