Redid the view and url setup so its less bloated, and more easily customised