us43497: First version of popup, minor changes in navbar style
us43497: Popup refactor