Update of the demo application (UX improvements)