Fix layout
Update links