Minor additions and modifications to smooth out menu usage and layout.