before fixing initial condition problems
fixed layout