navbar text styles
merged masterbranch