Better button enable handling, more correct thread contexts.
Removed redundant callings.