tools page all done and several fixes across other pages