For the menu I would definitely suggest making your edits to the default files. I'm still having problems getting the items to show in the sub category and on the main menu. Would it be possible for you to post a sql file of your db, minus the wa_settings table in a zip file? If I can use your same data it might help me get the same result. If there is private info in there or you don't feel comfortable posting it here I can open a ticket for you so we can exchang ethe info privately.