Fixed all the menu issues for MAC

Need to test the theme in Windows