Minor formatting. Marquee working properly. Fixed a null exception