bootstrap styling
merging css with master