Try to ad tool bar. Make some improvements