Merged homepage w/ new design