[regrecall] - fix the toolbar issue caused by the rotation
[regrecall] - resolve the conflicits