VIVO-719 Improve the user interface