MVC logic re-organization. Overall improvements and new features added.