ui redesign + unit test modification