Fix position problems
Tidy up templates
Add paginator
Merge branch 'master' of github.com:lqez/ndc13