Moved around views, fixed up urls, ready for deploy