Added icons and nice details