updated layouts, added migrations