Yes! The elements of Typographic Style is more Type oriented, likewise with Ellen Lupton's books. Grid Based Graphic Design by Müeller Brockmann is the one you want for grids specifically, and anything Swiss in general is probably fine.