code cleaning
Merge branch 'menu' of https://github.com/fin-ger/cg-st-adv into menu