Cleanup CSS files
And minimal changes in views