Deleted some public views
Updates to html/css
Fixed conflicts