Added operate mode button + fixes