Structure updates

Fixed NAv, automatic back to top.