Update menus layout and fixed typo
Updated evaluation criteria