menu re-org, layout update for homepage