some refactoring also added landing page for customer service queries
Refactored some ..US6 not completed yet