Remove flexbox from places where it's unnecessary