Design tweaks for links. Fixes #26. Starts #21