Fix layouts issues in css
Fix merge issues in index and bakery.css