added functionality to administration page
Merge remote-tracking branch 'origin/fixMarkerPage' into develop