Clean up
Fix showing language selector from popup om main screen crash