Css adjustments and refactoring