Web App Feedback implementation and Major Refactoring

Web App Feedback implementation and Major Refactoring