Allow keys to be re-enabled & minor cosmetic updates