BluePay and menu rework complete