A couple of minor toolbar changes and updated scripts