Rebuilding Layout - commit #1