Moved link wrapper
Fix up more styling