Css adjustments
Css adjustments and refactoring