Add borders to easier follow focus
Remove mirror layout, never use it