Style redone on a less messy template
Nick's changes merged in