Expanded mvc classes and UI stuff