Add answer, restructure ui code.