Added button active passive functionality