Layla link fixes and cursors