Fix the lay out