moved labels and messages to respective resource bundles