Fix differences in menu and wrong grid classes

Closes #5574