improve markers and remove back on 500 page
Merge branch 'master' of github.com:schlubbi/IMI-Maps