updates first with new architecture
fixes second for multiple column layouts