Cleaned up display logic, cautiously introduced MVC library