Fixing conflicts
Menu module created