updated styling and fixed template implementation
Merge pull request #2 from julianlam/master

updated styling and fixed template implementation