[upd] improved grid system