story: 45644701 putting links in buttons and removed redundant code