Adding icons and rearranging grid