merging new css to fix bugs
merging css
Merge branch 'vic-merg' into merging