Removed unused stuff, updated one of the views