Working on fixing the app extension of free return toggle and checkbox that appears on front-end.