Fix activities names and menus

Issue #461 
@MohamedBassem