made minor changes to index
misc minor
fix merging errors
show map
ajax on show page