Daniel/improve user interface

/cc @jwswj @s-vizzari