Extend to more views + enable limit markers