Improved the Layout