Fixed imports and added focus