add some style / fix some bug