Add our own static navbar

Also merge fix.