Reorganize marker js a bit so bathroom only changes bathroom