Adding in icons and other things