Improved the overall layout.