Turned export and Search into partials