FeedbackView refactoring