Code refactoring
standardize the css classes