fix some bug and apply skin (not yet)