Removing staggered flow layout for now
Refactorings