Fixed DOM to match Bootstrap navbar docs.  Preserved essential classes and ids so that clicks/behaviours still work.  Single mode now works and looks better.  Still a styling issue remaining - buttons push out the navbar so that the navbar grows when it should not.