Updating ToolbarWrapper
Tidying Build Scripts
Update to .version template