Fix components from menu