changed name of NewTopBar to TopBar