Tab refactor

We need to keep `:focus` states intact.