Fix margins for flexbox, clean up css for flexbox