Modals Added, amended mid-conditionals for cart