Fix for router exceptions
Updated home template
Merge remote-tracking branch 'origin/master'