Made lots and lots of changes everywhere, sorry for the crappy description
Updated views and models