Improved Edit Dialog!