Added icons and things