fixed some issues with merge conflicts (first attempt)

Tried to pull as someone else was pushing and had major problems and am not sure what changes of mine made it through.  This is the first round of changes focused on getting the generator page working