clean up code, add flex box - no fall back.
Merge pull request #1 from andy-box31/restructure

clean up code, add flex box - no fall back.