ticket:5 links buttons rearrangement