menu adjustment
Merge branch 'u30x' into demo