Minor changes on popup-layout.