Tools and templates changes + sidebar