Rework variables so that they show up in page even when not set.  Removed spaces from variable names