Improve link buttons