DRY'd out the template and changed general look and feel
added some subtle stylistic changes