Label functionality added plus fixes