Improved code dialog