Update registration layout and index slightly