Merge pull request #29 from tommyschnabel/Tommy

Tommy
Fixed styling for templates