minor changes in layout and migrations