Adding pills and tabs.  updated the nav too