Revert "Moved model lists to MVC"

This reverts commit 9cf04736ac4625cebb029552774d26ae5f7ab8d9.
App-wide minor changes
Merge origin/master