Tidy up and rearrange page