Little improvement
Better layout