fixing layout rest