Rearrange navbar. Closes #18.