Re-arrage grid and fix title link bug