UI changes and new cursor