Split into table and map view