rewrote menu classes