Fixed Display Label Issues +  Code cleaning