Start fixing homepage template
Fixes and other things