Get rid of Flexbox in favor of calc

Add media queries