More layout updates, continued to rearrange homepage