Refactor options view using a template
Merge pull request #163 from djuretic/master

Refactor options view using a template