Modified UI and added unregister