add Configuration; update some ui code;