Revert "fix build"

This reverts commit 5713c0691f539ae6f5d52d8ec6d255430bd6ad34.
Revert "clear conflicts"

This reverts commit d4b783e7f627ef77710695f3726e1455d1721291.
Revert "Runtime toggle of navbar"

This reverts commit 938b330a477ec9ebfec7728c97ddf40026ea1119.