Bunch of fixes to makers and home pages