adjust grid to fit background
merge module changes