Further css clean up and rename a class for naming conv consistency