Fix, and fix again the layout