changed nesting structure of xblocks and container styling to improve sass readability and minimize obtuse property overwritting