Further changes for switch to bootstrap navbar