library resources refactor, clean-up, grid tweaks