Improve overall layout