some updates to the ui management