Update build tools, use Toolbar, improve back, cleanup