simplify grid module and remove box module in favour og block