adding deactivate and activate button, move turn on and off button into status field