button styling
Merge branch 'master' into heather
navigation changes
Merge pull request #6 from zmoshansky/heather

button styling and nag changes