Partial fixes to styles