starting to rearrange icons in better groupings