Improving markup and refactoring css classes