Reformat GUI into its own class