Info panel labels now white.
Some classes refactored.