Reversed adding plugin + Fixed UI