[RJA-2095][feature] - UI last changes