Added basic GUI functionality
More tweaks