Revise UI structure and update content