fixed merge with master conflicts, navbar now has height property to allow height customization