Improved labels and moved to language files