Fixed stave width issues, using magic numbers!