Adss user template
Tweaks to index
Merge pull request #11 from twokul/fixes-index

Fixes index