Added train popup and fixed double arrow on popup