Added "Top" and other fixing