:fix some bugs and layout