Fix of tools and inner windows