Task #986 - lining up links etc as well