* Fixed squares on the edge of arrows next to selected subject (on behalf of Linh)