removed grid from base and added some breakpoints