Time view fixes