Meta, linking and layout fixes