Added back quicker loading, with popping while laying out