fix design page
fix service page
some changes
Merge remote-tracking branch 'origin/merge_master'