Fix width of row borders, add to 'In Progress/Private', refactor