Fixing transition bugs and cursor managment