Added lots of CSS changes. Templates changed as well