# moved menu categories to xml; # minor changes;