Implement location pagination #47
Update templates #47
Fixes for #47