Add label to collapsed menu icon, refactor