before fixing layout