Bugfix/activity menu