#174 Change menu for new requirements
Merge branch 'A/feature/#174' into Axolotl