Grid and responsive fixes