Restructuring of GUI row infrastructure and add diangosis now on different window