Lots of changes. Working on views and CSS