Fixing css issues for Karen
Merge branch 'vic-branch' into merging