lots of style and template changes