Other changes and add temporaly menu
Merge remote-tracking branch 'origin'