Revamp with new link option, and other small spacing improvements