Added message to saved state; adjusted margins