Fine tuning and clean up.

Removed functionality and added auto save when loosing focus.