Cleanup
Fixed bug with keyboard enter to edit
Cleanup
Minor
Cleanup