Tool structure and minor CSS fixes