Added close support and language switch