Fixed Phenogrid Display Label Issues +  Code cleaning