Icons and less confusing popup menu

so sick