Huge cleanup and added tools page