Added UI and cursor control