Fix menu and clean up toggle list function.