Minor reorganising and Screen Move Cursors