Start of moving event registrations to more appropriate locations
Seperate out the events that cause repaints
Moved event registration to appropriate locations