Improved Layout Further