removed hard coded language and add home switch