Moving map and table to partials