Re #302: Fixed links
Re #302: Content layout fixes