some fixes, code clean-ups, disabled on blur behavior if cancel button present