Cosmetic and css adjustments