Section headers now show up (no functionality).  Also cleaned up code somewhat