Removed un-used and unnecessary event handlers. Also fixed naming on some controls.