Grid refactoring and fixing media queries, adding line height settings