Remove button without onclick action + added inhibit/allow on idle buttons
Merge remote-tracking branch 'AeonNox/master'