GUI progress

finished merging code and added more GUI elements. Needs more work