UI updates to wok with accordioning product list, code cleanup and refactoring