* Save the state of the main application's button and reload them the next time.
* Various code cleanups. 


(Old svn revision: 5746)