Connect correct retina box signal (#24), cleanups