change a little in design and some locale fix