[IMP] Change menu to be conform like version 7.0