Added separator and editable decoartors + beetween plugin + fixed bugs