Adjusted UI to fit MVC pattern
Major changes and restructuring to UI