Removed css rules which encroached on design
Made $context an optional parameter in type-setting mixing and improved comments