#16 fixing styles for new markup structure