Changes to default layout.
Resolving conflicts
Clean-up
Use the compressed version of CSS files