Design fix
Editable id on entry pickers
 indent fix