Updated views across the board
Clean up unneeded file