removed marquee, fixed layout