Changed navigation bar to toolbar