Some design changes, and icon addition