Better use of of styles, more type tweaks