Improved enchanting layout