Fix collection controller
Fix home layout
Fix home layout