improved flow between folder and entry