Updated flexbox
Need to add better comments