Remove duplicate menus in discover page & fix case issues.
Move code a little bit for previous fix.