Undone advanced ui changes. Needs testing