Rearranage and remove esc delay
WIP: improving split management with unite