Move plugin buttons modif in plugin + bugfix