Big progress in tablet mode, several extra classes removed