Added more consistent icons.  Clicking in collapsed menu now closes it