Aesthetic + Minor Link Improvements