Rewrite logic to display 'no data' message correctly, tweak link icons.