tighten up layouts a little
extend expiry of executive instance keys to 7 days