Updated UI for better organization ref #1, #2, #3
Removed old ui files