icon, and minor menu changes.