small updates
Merge remote-tracking branch 'origin/feature-remove-bootstrap-new-less-structure' into feature-remove-bootstrap-new-less-structure