Added Lang files and Fixed ID Issue