fix rendering (and use flexbox!)