Misc cleanup, intro/nav changes