Rework xs display to adapt to registration