Improved code efficiency. Layout changes.