Re-arranged menu to a more logical order