Cleaned up some UI issues. Cleaned up some event handling issues.