Adjust FSM of UI, other UI improvements.