fixed some issues with templates and cleaned home and list handlers
Merge branch 'master' into 0.5-testing