Several amends to styles and css classes