Adjusted time window, better layout