Adjusted ui hierarchy to follow proper MVC