Fix to various menu issues. Did a general cleanup.