Updating XBaya menues

[Saminda Wijeratne]

As per discussion in jira [1], I'm going ahead with the changes suggested
for menu re-arrangement of XBaya. Will try to provide the patch ASAP.

Regards,
Saminda

1. https://issues.apache.org/jira/browse/AIRAVATA-102