Add zoom border component.
Focus improvements and cleanup.