mod grid and menu and translate
fix conflicts