Move close button; adjusted margins