some fixs and style