Modified layout and migrations