more changes to metadata UI implementation