Added icons and stuff