Fix what goes wrong in commits.
Fix conflicts in structure.less
Hand merge c484f48833ea23085dfd898418661fb6abf2f00f