User Interface

Updated the mechanics, including cleaning up some files and improving
the user interface experience.