Cleaned up and added some stuff to the views