Disabled buttons aren't visible now.
Minor improvements.