Complete nav, add smart form search