remove ugly css hack
Merge branch 'view-refactoring'