Thesis' intent changed, UI refine