Inverted navbar
Merge fix