Added icons and some sorting