Better toolbar
Working on main ui