Fix a few issues with flexbox layout