rebased css
Layout fixes