Feature/usability tweaks

For SLN-752