Fixed level 1 cursor management, added level 2