Fixed #1 regarding enabling and disabling command buttons