Renamed everything and removed unnecessary code.  Changed function, class, and layout names to make more sense.