Improved the layout of the first screen