Fixed some of the views and added some stuff to the db