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