Some fixes for task build
Homepage WIP
Merge remote-tracking branch 'origin/master'