Disable/enable buttons feature added