fixed disabled button hover, more code cleanup