menu order for su and themes

Change-Id: If80452b61de26b88ae8a6c46192ad658c61aab0f