Increased tool tips and organization