Reorganizing tabs as in #84