FIX flexbox issues
Thanks @tzi for your help (as usual).