Add migrations and change layout structure