Slightly improved layout - need advice on best way to get a neat grid layout