clean up some template flicker and spacing issues in links