add thumbnail and some fix