Structure fixes, syntax like BEM