Added button for toggling markup markers, other small fixes