Edit box cleanup and minor fix