Label class now working correctly