add Chinese support; improve layout