Minor changes to page1 and page2 initial design done

I made a few minor changes to how page1 is laid out.  These also
included changes to the menu.  The initial layout of page 2 of the
wizard is done.  After this the wizard will probably start to diverge
some.