Reworked where and when tab