Home page rearrangement

More visual changes