correct more ORM issues and change up the view layout