Fixed some bugs
Move language specific labels into constants