UserInterface improvment and bugfix on some texts