Links fixes, spacing fixes