sort by icons and style fixes