Fixed spacing problems and made pure grid work properly