change pic and fix bugs