Rearrange the menus and add new stuff

Task-Url: http://github.com/stoeps13/ibmcnx2/issues/issue/8