fix dispaly bug, also has a bug about checkbox
Merge remote-tracking branch 'origin/master'