Added views, cleaned up basic routing and tasks