Remove old application css
Add, modify user views
merged conflicts between upstream & master