Changed structure of UI classes