Refactors to use BS3 grid for remaining views