small fixes after last merge plus correct splitting of existing search
Merge pull request #50 from billsaysthis/navbar-tweaks-jan16

small fixes after last merge plus correct splitting of existing search