fix html
fix date
fix buttom
Merge remote-tracking branch 'origin/master'