Added better CSS classes