Fix br and list style problem
Merge branch 'cleanup' into devsite