Fixed menu class
fixed merge