Icon and cleaning

Added an icon for the title bar.
Cleaned up the code a bit - especially links.