refactor various templates and soon fix nav links
'test commit'
modularize user and lots of other things