Further Improvements to the Layout