Tweaked menu rules and rescripted the db