add styles to match original website
fix merge conflict with master