#898 Revamp the Backstage index formation
Small style fixes