marquee fixing

In progress..
merge