added class to labels
updated error issues