refactored views to align with MVC