Merging GUI into master