ORG-1129:improve UI in frontend