refactor things for cleanliness and prosperity
template file adjustments
Merge pull request #1 from m-e-h/master

master to dev