Renamed controls, began improving interface...

...and simplifying the source code where possible.