General code cleanup and renaming

Renamed the GUI to control to make it easier to find.
Updated some of the filtering/sorting methods to make more sense.
Still receiving occasional bug when re-scanning code