Added toolbar to settings and tab view