Temporary fix to toolbox adjusting issue
Changes to themes
Amelioration of navigation tool
Renaming of tool containers