Changed menus to have wpet_ prefix to avoid collisions
Restored some formatting
Reordered menus