added icon and made rearranging work