Removed old UI. It all works.

Still need to remove commented-out text