Add close button & tray support.