Updating dialog menus for switches to allow for 20 items on a single page. Various minor changes in the source code to improve consistence with new the compiler. PEJ