wip - converting stuff to use flexbox