Cleaned up and fully working GUI