case 3937 - Minor improvements and proper button display handling.