Changed structure of UI