Simplify extenders, overrides, add clearfix