navbar style adjustments, watch for busting hierarchy
Merge branch '1.2' of https://github.com/pagelines/DMS into 1.2