Added missing loop
Removed duplicate layout