apply some  of the feedbacks for admin UI