final style tweaks and changes