Add the spec, improve nav