changed design and add a few menu
fixing confict