More renaming and cleanup.
Moving Click* methods to the Panel class.
More renaming and cleanup.
Simplifying the code for CleanupTimeout.