Project/11289/sparky usability improvements

@iberben please check and merge.