Updated CSS classes following BEM way