Relayout and add test stub