Adds Requirement 1 GUI features

Also cleaned up a lot of the code to get rid of warnings.