Update static markup code, remove unnecessary div.
Merge remote-tracking branch 'origin/master'