more updates to internal ui plugin logic