Final Things on grids
Updated all tests according to new menu
Updated all tests according to new menu
and added few tests